(x_set_font): When ARG is a font-object, don't alter the

fontset of the frame.

diff --git a/src/frame.c b/src/frame.c
index 7074e14077e5f74ef970cbeb8e7b6b988d5940a9..52733044f7a9ff55fd2e472e5307a2dc0ec3bbc5 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -3399,10 +3399,11 @@ x_set_font (f, arg, oldval)
   else if (FONT_OBJECT_P (arg))
     {
       font_object = arg;
-      /* This is store the XLFD font name in the frame parameter for
+      /* This is to store the XLFD font name in the frame parameter for
         backward compatiblity.  We should store the font-object
         itself in the future.  */
       arg = AREF (font_object, FONT_NAME_INDEX);
+      fontset = FRAME_FONTSET (f);
     }
   else
     signal_error ("Invalid font", arg);